gtkpanedaccessible.c \
gtkprogressbaraccessible.c \
gtkradiobuttonaccessible.c \
- gtkradiosubmenuitemaccessible.c \
+ gtkradiomenuitemaccessible.c \
gtkrangeaccessible.c \
gtkrenderercellaccessible.c \
gtkscaleaccessible.c \
gtkpanedaccessible.h \
gtkprogressbaraccessible.h \
gtkradiobuttonaccessible.h \
- gtkradiosubmenuitemaccessible.h \
+ gtkradiomenuitemaccessible.h \
gtkrangeaccessible.h \
gtkrenderercellaccessible.h \
gtkscaleaccessible.h \
--- /dev/null
+/* GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2002 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include "gtkradiomenuitemaccessible.h"
+
+
+G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)
+
+
+static AtkRelationSet *
+gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj)
+{
+ GtkWidget *widget;
+ AtkRelationSet *relation_set;
+ GSList *list;
+ GtkRadioMenuItemAccessible *radio_menu_item;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
+ if (widget == NULL)
+ return NULL;
+
+ radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj);
+
+ relation_set = ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj);
+
+ /* If the radio menu_item's group has changed remove the relation */
+ list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget));
+
+ if (radio_menu_item->old_group != list)
+ {
+ AtkRelation *relation;
+
+ relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_MEMBER_OF);
+ atk_relation_set_remove (relation_set, relation);
+ }
+
+ if (!atk_relation_set_contains (relation_set, ATK_RELATION_MEMBER_OF))
+ {
+ /* Get the members of the menu_item group */
+ radio_menu_item->old_group = list;
+ if (list)
+ {
+ AtkObject **accessible_array;
+ guint list_length;
+ AtkRelation* relation;
+ gint i = 0;
+
+ list_length = g_slist_length (list);
+ accessible_array = g_new (AtkObject *, list_length);
+ while (list != NULL)
+ {
+ GtkWidget* list_item = list->data;
+
+ accessible_array[i++] = gtk_widget_get_accessible (list_item);
+
+ list = list->next;
+ }
+ relation = atk_relation_new (accessible_array, list_length,
+ ATK_RELATION_MEMBER_OF);
+ g_free (accessible_array);
+
+ atk_relation_set_add (relation_set, relation);
+
+ /* Unref the relation so that it is not leaked */
+ g_object_unref (relation);
+ }
+ }
+
+ return relation_set;
+}
+
+static void
+gtk_radio_menu_item_accessible_initialize (AtkObject *obj,
+ gpointer data)
+{
+ ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data);
+
+ obj->role = ATK_ROLE_RADIO_MENU_ITEM;
+}
+
+static void
+_gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass)
+{
+ AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
+
+ class->ref_relation_set = gtk_radio_menu_item_accessible_ref_relation_set;
+ class->initialize = gtk_radio_menu_item_accessible_initialize;
+}
+
+static void
+_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item)
+{
+ radio_menu_item->old_group = NULL;
+}
--- /dev/null
+/* GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2002 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
+#define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
+
+#include "gtkchecksubmenuitemaccessible.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (_gtk_radio_menu_item_accessible_get_type ())
+#define GTK_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessible))
+#define GTK_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass))
+#define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE))
+#define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE))
+#define GTK_RADIO_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass))
+
+typedef struct _GtkRadioMenuItemAccessible GtkRadioMenuItemAccessible;
+typedef struct _GtkRadioMenuItemAccessibleClass GtkRadioMenuItemAccessibleClass;
+
+struct _GtkRadioMenuItemAccessible
+{
+ GtkCheckSubmenuItemAccessible parent;
+
+ GSList *old_group;
+};
+
+struct _GtkRadioMenuItemAccessibleClass
+{
+ GtkCheckSubmenuItemAccessibleClass parent_class;
+};
+
+GType _gtk_radio_menu_item_accessible_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ */
+++ /dev/null
-/* GAIL - The GNOME Accessibility Implementation Library
- * Copyright 2002 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include "gtkradiosubmenuitemaccessible.h"
-
-
-G_DEFINE_TYPE (GtkRadioSubmenuItemAccessible, _gtk_radio_submenu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)
-
-
-static AtkRelationSet *
-gtk_radio_submenu_item_accessible_ref_relation_set (AtkObject *obj)
-{
- GtkWidget *widget;
- AtkRelationSet *relation_set;
- GSList *list;
- GtkRadioSubmenuItemAccessible *radio_menu_item;
-
- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
- if (widget == NULL)
- return NULL;
-
- radio_menu_item = GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE (obj);
-
- relation_set = ATK_OBJECT_CLASS (_gtk_radio_submenu_item_accessible_parent_class)->ref_relation_set (obj);
-
- /* If the radio menu_item's group has changed remove the relation */
- list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget));
-
- if (radio_menu_item->old_group != list)
- {
- AtkRelation *relation;
-
- relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_MEMBER_OF);
- atk_relation_set_remove (relation_set, relation);
- }
-
- if (!atk_relation_set_contains (relation_set, ATK_RELATION_MEMBER_OF))
- {
- /* Get the members of the menu_item group */
- radio_menu_item->old_group = list;
- if (list)
- {
- AtkObject **accessible_array;
- guint list_length;
- AtkRelation* relation;
- gint i = 0;
-
- list_length = g_slist_length (list);
- accessible_array = g_new (AtkObject *, list_length);
- while (list != NULL)
- {
- GtkWidget* list_item = list->data;
-
- accessible_array[i++] = gtk_widget_get_accessible (list_item);
-
- list = list->next;
- }
- relation = atk_relation_new (accessible_array, list_length,
- ATK_RELATION_MEMBER_OF);
- g_free (accessible_array);
-
- atk_relation_set_add (relation_set, relation);
-
- /* Unref the relation so that it is not leaked */
- g_object_unref (relation);
- }
- }
-
- return relation_set;
-}
-
-static void
-gtk_radio_submenu_item_accessible_initialize (AtkObject *obj,
- gpointer data)
-{
- ATK_OBJECT_CLASS (_gtk_radio_submenu_item_accessible_parent_class)->initialize (obj, data);
-
- obj->role = ATK_ROLE_RADIO_MENU_ITEM;
-}
-
-static void
-_gtk_radio_submenu_item_accessible_class_init (GtkRadioSubmenuItemAccessibleClass *klass)
-{
- AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
- class->ref_relation_set = gtk_radio_submenu_item_accessible_ref_relation_set;
- class->initialize = gtk_radio_submenu_item_accessible_initialize;
-}
-
-static void
-_gtk_radio_submenu_item_accessible_init (GtkRadioSubmenuItemAccessible *radio_menu_item)
-{
- radio_menu_item->old_group = NULL;
-}
+++ /dev/null
-/* GAIL - The GNOME Accessibility Implementation Library
- * Copyright 2002 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE_H__
-#define __GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE_H__
-
-#include "gtkchecksubmenuitemaccessible.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE (_gtk_radio_submenu_item_accessible_get_type ())
-#define GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE, GtkRadioSubmenuItemAccessible))
-#define GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE, GtkRadioSubmenuItemAccessibleClass))
-#define GTK_IS_RADIO_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE))
-#define GTK_IS_RADIO_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE))
-#define GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE, GtkRadioSubmenuItemAccessibleClass))
-
-typedef struct _GtkRadioSubmenuItemAccessible GtkRadioSubmenuItemAccessible;
-typedef struct _GtkRadioSubmenuItemAccessibleClass GtkRadioSubmenuItemAccessibleClass;
-
-struct _GtkRadioSubmenuItemAccessible
-{
- GtkCheckSubmenuItemAccessible parent;
-
- GSList *old_group;
-};
-
-struct _GtkRadioSubmenuItemAccessibleClass
-{
- GtkCheckSubmenuItemAccessibleClass parent_class;
-};
-
-GType _gtk_radio_submenu_item_accessible_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE_H__ */
#include "gtkactivatable.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#include "a11y/gtkradiosubmenuitemaccessible.h"
+#include "a11y/gtkradiomenuitemaccessible.h"
/**
* SECTION:gtkradiomenuitem
widget_class->destroy = gtk_radio_menu_item_destroy;
- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE);
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE);
menu_item_class->activate = gtk_radio_menu_item_activate;